From 46a8d6e80d8d735de2f89d49eaf6987acd906560 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 23 Nov 2001 23:55:19 +0000 Subject: [PATCH] Remove some strange arithmetic that was resulting in rows being drawn too Fri Nov 23 18:49:53 2001 Owen Taylor * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange arithmetic that was resulting in rows being drawn too low. (#65001, reported by Damon Chaplin) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-0 | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-2 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkclist.c | 2 +- gtk/gtkctree.c | 2 +- 9 files changed, 44 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5b77d332c..75fb77048c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index b5b77d332c..75fb77048c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +Fri Nov 23 18:49:53 2001 Owen Taylor + + * gtk/{gtkclist,gtkctree.c} (draw_row): Remove some strange + arithmetic that was resulting in rows being drawn too low. + (#65001, reported by Damon Chaplin) + Fri Nov 23 18:36:42 2001 Owen Taylor * gtk/gtkrange.c (gtk_range_button_press): Offset diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index 791bc9817c..1e73ed5b63 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -5853,7 +5853,7 @@ draw_row (GtkCList *clist, case GTK_CELL_TEXT: if (layout) { - gint row_center_offset = 1.5 + (clist->row_height - logical_rect.height - 1) / 2; + gint row_center_offset = (clist->row_height - logical_rect.height - 1) / 2; gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle); gdk_draw_layout (clist->clist_window, fg_gc, diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c index 9e5c6a33c9..f195f6a499 100644 --- a/gtk/gtkctree.c +++ b/gtk/gtkctree.c @@ -1936,7 +1936,7 @@ draw_row (GtkCList *clist, case GTK_CELL_TEXT: if (layout) { - gint row_center_offset = 1.5 + (clist->row_height - logical_rect.height - 1) / 2; + gint row_center_offset = (clist->row_height - logical_rect.height) / 2; gdk_gc_set_clip_rectangle (fg_gc, &clip_rectangle); gdk_draw_layout (clist->clist_window, fg_gc, -- 2.30.2